Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 06:11:31 +0000 (22:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 06:11:31 +0000 (22:11 -0800)

Trivial merge